Merge changes from topic "rvc-dev-trout" into rvc-dev am: 7bb7ec3df4 am: 7244674908

Change-Id: Iac3e747f168cbde8ffe63dd85c94b48f141dd1a3