[automerger skipped] Merge changes I38628dad,I2467b647 into rvc-dev am: 027c80d2d6 -s ours am: 1a16968c3b -s ours
am skip reason: Change-Id I38628daddcb7be7c74846e78d36dc88f065b97d9 with SHA-1 360c88f238 is in history
Change-Id: I3dd2067abd65e21a48f6543c08e98a6eafc72ead
This commit is contained in: