Snap for 4656203 from e69e8d3d3f8ba94b9b912d901d04ed306f3c9662 to pi-release

Change-Id: I87f9cbddb049265f2bcbbe1f1c262e4c376b35f4