Merge "Multi-package support for APEX." am: 1b676027c4 am: a9e3aab145
am: ed6ab556a1

Change-Id: I65b29749130a809656349818abcbd88469fbbfe1