Merge "Enable the APEX support on the device side." am: 239245fe79
am: 7cc9405fbc

Change-Id: I3145633d1de3484c4f27eb3f4dd4ea4a341eaa7e