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

Change-Id: I5a4d2ab7b6c2fb357b926c0980c34f9369232509