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

Change-Id: I79b2777e746ee0fd64b8bd5c380b8d2bb5af248a