Merge "Rename APEX Namespace" am: fcbdba22ab

Change-Id: Ifdee2653abc4c6991bcb78024f930d37321cb860