Snap for 4632767 from ee04cf91e69ed1ea9cb2e00c5a4764f6b67c4175 to pi-release

Change-Id: I028581684d39a92a62ba7e297497877eb7167219