Merge changes from topic "apex_available"
am: 5bcceefd3c

Change-Id: Ic3b8c4e480f158f127fbd9bb46639629121ff97c