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

Change-Id: Ie1eac882697a5ef8d1feeae4c07003adae1bde53