[automerger skipped] Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev am: a72d7e53e6 am: 183986e0a9 -s ours am: 8b93af562d -s ours
am skip reason: Change-Id Id71b4cbc57c6569f58b6d906cc8361c104a507dc with SHA-1 52e8922e8a is in history
Change-Id: I36f291c19051d54e40ed3f733327ae69790a7917
This commit is contained in: