Merge "Add #! to 'am' shell script" into klp-dev