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

Change-Id: I98bfb472473d967024ca3b1113872176ddddc3da