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

Change-Id: I5a4e2dd8c3b39f3144ac0db0909763b7f1fe84f2