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

Change-Id: Ia445f1af2e051210a1c4510661c8b921f976f274