[automerger skipped] Merge "Enable the APEX support on the device side." am: 239245fe79 am: 7cc9405fbc
am: 3af2f75196  -s ours

Change-Id: Ibb0c53efc51ff624356343b138c01508d26e5f37