[automerger skipped] Merge changes from topic "apex_available" into rvc-dev am: 132bb5f8 -s ours
am skip reason: Change-Id Id926bc4324d3259def21ea19d3bd72320311a6e3 with SHA-1 b5673033 is in history
Change-Id: Id6bba4b716fa96c47562714e5bb164fe9c6807d8