January Pi-platform-release merges

Change-Id: Id7649994e74ce6d20855e8aedbe74e242dc29f79