[automerger skipped] Merge changes I97ba5903,Icd80b368 into rvc-dev am: d3d72d4452 -s ours
am skip reason: Change-Id I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c with SHA-1 ec51fecfe6 is in history
Change-Id: I5963d5e7306cff4a1c4cf4bca483a40536f73e14
This commit is contained in: