Merge "Rename apex keys to match with APEX bundle name"
am: 1d70702b17

Change-Id: If9e8392691c149e8a1330f3bcf945d737a9c2b88