Snap for 4453288 from ed4af52ae97591018ac5b7a1eea60739576cba64 to pi-release

Change-Id: I877109ae719a184f449b8ae5eb626db901581670