Snap for 4959688 from 121d4eee01f16e5b0c355f0f7813839ecb52aa87 to pi-qpr1-release

Change-Id: If4f6a0077880729a11015a2164b6b887bad368a1