Snap for 4807121 from e07e0d09fb03ff258f07ae7092a41fc01895b47d to pi-release

Change-Id: Ia59700f6216daae6069447d046c26e2fd15acfd4