Snap for 4635315 from 0f6c3ec0971af7be632ab7ee3286791e6e0a9418 to pi-release

Change-Id: Ie0e85458ee19a8954de8aae674aee5ed3e089186