Snap for 8261185 from 89bc9b2fb76351f4874cefaa0dab731707c3f61b to sc-qpr3-release

Change-Id: Ie36b781eb3d8a5245b8547c5d904f6d7fba5a86e