Merge changes from topic "iorap-snap" into rvc-dev am: b4c187f5ce am: 6610e3ca53 am: df37e06495 am: 05c8f09b4e
Change-Id: If9a293d13fcf40b086f950c92fed1f2413218776
This commit is contained in: