Merge changes from topic "move_boottime_script" into pi-dev am: c2f4a88c5a
am: 7c4d00d660

Change-Id: I853c37be4db9061eb6817683f689cbbe1137537b