[automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5 -s ours am: 376bf32b -s ours am: aa3c6b1c -s ours am: 4e1229cb -s ours

am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 34073efb is in history

Change-Id: I7c770a85156495a8881620e00232f89d77e64846