[automerger skipped] Merge changes I98979758,I1c49711d into rvc-dev am: 35b779fd5a -s ours
am skip reason: Change-Id I98979758a7a684219e35c02ded93224ea172d44f with SHA-1 8cfc634bbc is in history
Change-Id: If9bd668aee4aac2ebe8dfbc742b71eccf8bb7247
This commit is contained in: