[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 719ecaf028 -s ours
am skip reason: subject contains skip directive

Change-Id: I804c5ed88bb11421826d4ceb564b24a0c0e227b1
tree: e1b1d7b876c99767aabaee463b4bd89104a8087a
  1. vrcore/