Snap for 4574286 from bf60e4ab676cf31cea50d7a4071e8d845d90a238 to pi-release

Change-Id: I54a6a02047f29fbb8f8bcf83305b53f74057696a