Merge changes from topic "apex_available" am: 5bcceefd3c
am: 288e14b37c

Change-Id: I32b7187ea9684fa121c08f5e3b7c4d5e6f6bdd54