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

Change-Id: I3855f4ae68f7a2e9b0df7a4f51ea994a0a5ef0aa