Snap for 4807121 from c2ed3617dd58958822b65e512db99de527cc8da3 to pi-release

Change-Id: Ibbe06900a186bdf77b294e13e5a7ae2fe9bc46f5