Merge changes from topic "jr-onboard" into pi-dev
am: fd7d5779c3

Change-Id: I3313558f4438ec2ebb2c68e8490c7b287efe3faa