Merge "Rename apex keys to match with APEX bundle name"
am: 56f6b9bde9

Change-Id: I67726f86ef64e16da1a6d39177852ba60fcac8ab