Snap for 4693621 from e7962cca83035d93ca32912c47f46a1c5a4ef016 to pi-release

Change-Id: Ie331bf6dcebd802d6d990a7a312598de84d5433f