Snap for 4464948 from e9ba9944362dbd2e5fe1dcf4ba62ff0af925b44a to pi-release

Change-Id: I14ac391008f93f5edd8a6259480e56a3307f07e4