Cherry Pick of 7066a57275b0eb1da07f0d81f4f8f2cf574fe094
Script Lint
CPicked 67d47563456af55636525259fad755ae34dcf36a