Merge "APEX list can be retrieved via the shell command." am: 06de45a54a am: d28e616024
am: c66425b09a

Change-Id: I63e6e4c7904a76257f341481d7b3b87e004657e2