Snap for 4781566 from d317d2c6457fbe7ea8e10aed537c7d797682ed0e to pi-release

Change-Id: I414b373396f0e21d8481aaa97baca0f250ee18e9