[automerger skipped] Merge changes from topic "apex_available" into rvc-dev am: c27404e7ca -s ours

am skip reason: Change-Id I85ee900947df2c9ce076e2f3aa3145645da77d2b with SHA-1 ad9946c09a is in history

Change-Id: If1029d7278c57dd835ae042690dbda07a4388be4