Snap for 8426946 from 0e17e61443ff05733905099bc25073b9e2463270 to sc-qpr3-release

Change-Id: I3ddc9913bec9193dae2085ffcf756ad327fe5c3f