Snap for 4535700 from e4d3f2a6d58e4b9df9838e65626e2a9d3b11ef2d to pi-release

Change-Id: Ieaa7aa36a6afb3c84820434930f598c3927e857e