Snap for 4759746 from 47b7e876148e345142200af4ba8b99862ddcbdaf to pi-release

Change-Id: I93cc8897680cbba623aff59f6f21887d81919f81