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

Change-Id: Id26e95b85faadb64f6673942c63115df74edfca7