Snap for 4916303 from a935bb4fe1257d443a5dfbc0875b79bc2b7e499d to pi-qpr1-release

Change-Id: Ifeef0060980d51c9950c9727b63f30534b40591d