Snap for 8156389 from 65aca55f0641e6f95bc8a5ddca3d71a40ead0c83 to sc-qpr3-release

Change-Id: I08537168b144d952c23964ecf91b75a9e06fe1b7