[automerger skipped] Merge changes I465ea6c9,I57b77d7c,I536a286d,Ie16a7bf7 into rvc-dev am: 04735a8ef2 -s ours
am skip reason: Change-Id I465ea6c98d52e839284d51b246203f6b8dfb5566 with SHA-1 0959fbfd2e is in history
Change-Id: I377b95deb72ab713326805e2d312d356c26e5726
This commit is contained in: