Snap for 4535700 from d2fc86d779a667624fd576c6e1f107e4c8339873 to pi-release

Change-Id: I2df826156640cdf2442e92414bad5c04ca858ad1