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

Change-Id: I44dc43978aeaa8f483fc90674b8f0752adb18aa0