Snap for 4818534 from bfe49e0b56a97f6ac9a66e500e9528af0fb6b02c to pi-release

Change-Id: I2fd3c7fceb3c5478a057f6f75834657aa33a5080