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

Change-Id: I999da337946411d2f6a60ad1b533381b7f10f2f4