Snap for 4818534 from 425d1b42eaeb44558ced57fc50dfb22187d01d05 to pi-release

Change-Id: Ife0d0b9d26d9f1afe17fb7d8e5faff1a4b0879e1