January Pi-platform-release merges

Change-Id: I169eb6f602569b9caccc8cd2eb454067006f2f13