Snap for 4778776 from e5a5cfb39fd8afefcca9c51a6728aa0d3637a1ae to pi-release

Change-Id: I95bd0d43d65ff81d0d178dd865e890db797a6581