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

Change-Id: I3cf0fa226667b80a77237fd95c0f0b1e4042fdf7