Snap for 6197114 from 661e84967bb2600427cb65715caeeba112b94244 to rvc-release

Change-Id: I869ee5f3571746c25505f80259150d56cec38546