Snap for 4778776 from 0db2d7b9dc463e4db33456b4944bb62d7281ba93 to pi-release

Change-Id: I806100e91a2940fa484164b05bbfb91166fe96ac