Snap for 4539010 from 9a9c9b09b900298549ecdbef960fd94c998065e7 to pi-release

Change-Id: I0fff2b0d857b83812f7cd880dbe67f5c078559ec