Snap for 4773106 from 332baf2ebf96bec1ce01f19ad04b3a1c813cc219 to pi-release

Change-Id: I6be78d9e671462fc71aba61833014e685c7e9e93
tree: e021443428212258c05e7dc5c1650cfe166631c9
  1. 28/