Snap for 4521654 from ab93addfbb282040f39392370889f6087f429345 to pi-release

Change-Id: Ic998139219d59d2e766a73db1ffa37814eeecc5d