Merge "Rename APEX Namespace" am: fcbdba22ab am: 613d40c4f5

Change-Id: I5d1daec21ddc0579d8277e72c127f160d125208d