Snap for 4620899 from f49b65256c6e5ae8b5efb500012d2776ca078d5f to pi-release

Change-Id: I7510183ce999b492eb83598fa210e8af652f3b73