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

Change-Id: Ib1a4c638bcc07360be8597ef4d61967c4eedb7b8