[automerger skipped] Merge changes from topic "rvc-dev-trout" into rvc-dev am: 7bb7ec3df4 am: 7244674908 am: 600a7dc263 am: d462b01548 -s ours am: 0582f92a5c -s ours
am skip reason: Change-Id I44609f8c7cbeffcb02cb9f2e2f56f3a829de17f6 with SHA-1 f724a227b0 is in history

Change-Id: I96d27037f5bb178b5278ca573327f186c1413e27