Merge "Finalize the name of the apex package"
am: 10265a8cbe

Change-Id: I3f0d4d3a02ca198a80bf24b81c22d5996da5d1a2