Snap for 4818534 from ee8025eb46d2fab8010f50fbd3234eb4ef3cce94 to pi-release

Change-Id: Ibdf8939ad2eedd20b3d18760e4e0595dbf919b6b
tree: 58e6184d54a3cbe0362375f947c693c7217b47c5
  1. 28/