Snap for 4459973 from ab75cacdf76a3a519f4c53108a2576b6b2cf2f75 to pi-release

Change-Id: Ie7141a7f5f4feb49d28c8e0f52604cf4cf2d9cc1