Snap for 4701683 from 60af9c3a914c518f39d58a79a74a4ffdc4bdaa3a to pi-release

Change-Id: I75cb19465ec86c1ebb2aaa729a169155c1ad0a49