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

Change-Id: I2daf5c6296bfb9f8b327bfff9fde350fe2fb6b9a