Merge "Accept apex packages as argument." am: 74cdc8a542 am: 2d0b04ddf7
am: 4ab3c04ea5

Change-Id: I88f75d4fa3d7a1a9416c26886ea835edbd98e986