Snap for 4662252 from 6f71650075c7661da52d8a44f127fe82f19e8084 to pi-release

Change-Id: Ia2ba1bba01e916c3db24ca82f5b74219ab873ea4