Snap for 4832339 from 63a0662d03791460a6ba882851e95b3e9eaf8b3b to pi-release

Change-Id: I42d4beebb2f6a3cb8495f026ac108af2cfb8a877