Snap for 4410151 from cbadad8ff01aabd891c9ec47655650a0f427fbb2 to pi-release

Change-Id: I9efd298760cdcbab737d25dd8e16b24527fe1ee3