Snap for 4722539 from e2ba218ec52e4e22d605ef7746079f76aef7b96b to pi-release

Change-Id: I0fe608ca9c3b7ed5553856fc52ea3d054b2910fe