Snap for 4565898 from 3034ef412053237c9955d0ecc3edc7b0324b8227 to pi-release

Change-Id: If3a713d7e6a2f64677939327d5584f5559efe614