Snap for 4621325 from 7cb2f308403b177720e6f022d404ce1fc414e663 to pi-release

Change-Id: I17d418bbfae95ce21c8af07df533bf32001a7a51