Snap for 4939496 from 89d23c04701125e30d2953768730fe518933135d to pi-qpr1-release

Change-Id: Ia33a26410d0fa37121075695f05f47a8f3bced64