Snap for 6729113 from c9820b8b227e97e297ba9a4f28878c11cc9aa86c to rvc-qpr1-release

Change-Id: I8dd9e7e20491c2339c19e8fa43a2179d140d6828