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

Change-Id: I8df90a50ab2069c0381d81d02568c945fe14f6e1