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

Change-Id: Idadcb16afddf19fa44f787838571f1b54b431de5