Update custom scripts

Change-Id: 21f5c59575
Story-Id: unassigned