Also renaming the list samples to make it clearer what they are. Change-Id: I91b209a32ad4dbf82982682884769d1cde8e3bc3
46b133a2