Snap for 7010201 from 59d3e37f1b9f4bc545aebb8db86708c2cceed7d0 to rvc-qpr2-release

Change-Id: I8705a5d681d9c59987915ee9637025c881e081e5