Snap for 6727488 from 1385c3a29472221d8dd9b56fc71f3bde56bf8730 to rvc-qpr1-release

Change-Id: I855548195a583008fdb7f283aaea5da107735fda