January Pi-platform-release merges

Change-Id: Ie428645850e95ab4b12e0be8530f52f21f850860