January Pi-platform-release merges

Change-Id: I21c97ff55557636349839e3cddb59f8afaca8107