January Pi-platform-release merges

Change-Id: Ib132651097d7cc9f2cc2b6bb8787d77c2bf84c07