Snap for 4562879 from 25c79ea1e064ec47b3d61a4fec8a6530c53846ae to pi-release

Change-Id: I8e8c39a8895bbdc5a65735723bfafe07f94d495b