Snap for 4402171 from f78c87ff704368f1e8162c7f518429c846c929be to pi-release

Change-Id: I4314c8bffe7dbfc783196b70248ffb69b1103141