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

Change-Id: Ibbefe2e408c0ba22db9b69e2abb4d1282a6bb8f4