Merge "Rename APEX Namespace" am: 72f6c23079

Change-Id: I92b398d0bc01ff3336ad568dd1bc8e8f424c12cd