Snap for 8166750 from b020e552d834171e3bd844d342c7c4ef2b9320c6 to sc-qpr3-release

Change-Id: Ic41f07210132aebcf4943419112b17b723f7864b