Merge "Rename APEX Namespace" am: 52120b489b am: 6e1b2ec7ac

Change-Id: Ie27efc805d25e509576981f7ae03cc70cb555153