[automerger skipped] Merge changes Id71b4cbc,I8dff0a12,Ife3d1390 into rvc-dev am: a72d7e53e6 am: 97606037b0 am: 5685ccd8ee am: 0d2e09379b -s ours
am skip reason: Change-Id Id71b4cbc57c6569f58b6d906cc8361c104a507dc with SHA-1 20dc51820a is in history
Change-Id: I8b6ecf868e0494c815e970bd9493280a630e6993
This commit is contained in: