Merge "Set fullpath for script" am: 4b03e176a6
am: c260aba848

Change-Id: I1a24104ee8d32465dd6614fa57a4a86be56a98d6