Snap for 4535700 from ed45c3c8bab0de7d974c801ec553e8927aa678d9 to pi-release

Change-Id: If3f23d7eb09c2318c04a57958f418d0d62d8626a