Merge changes from topic "iorap-snap" into rvc-dev am: b4c187f5ce am: 6610e3ca53 am: d83a14a5f2 am: 9e499b349e
Change-Id: Ie89981d6f9c39a6bf75b508a90455cef5dfd3391
This commit is contained in: