Snap for 4807121 from aea65680e6f3da83636dbc6af2ef1381de06d2a8 to pi-release

Change-Id: Id61934dcc353f297ad35ca1fbd7ffe385a2503a3