January Pi-platform-release merges

Change-Id: I83ac3786e8d8017cd47320173f4cdd8ec3fe49e8