Merge changes from topic "apex_available" into rvc-dev am: c27404e7ca

Change-Id: Idd8fbff12727252be52655a9662dbd1942536694