January Pi-platform-release merges

Change-Id: I066d3c186fd63b5a898b3337161bcfdb1bec60c9