Snap for 4548429 from a2f1a9b28468f900a33d3d5711d259b168f9cd1e to pi-release

Change-Id: I5639ea6f5beab97a6e3921e37ef6275afda49ea5