Snap for 6473661 from 1a27438093ea85a25a3b674d5a86b674bab2c48d to rvc-release

Change-Id: Ib6d70d6f920065dec0e981f6dcaf09f0e807840f