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

Change-Id: I59dd60711f9b0b21d1da88ebb9b7bb30885f73bc