[INTERNAL] GridLayout fix bug from Eslint adoption

Change-Id: I9dd85c61b72e2d3c26139bf8d5748826f8cbc6dc
Merge "[INTERNAL] GridLayout fix bug from Eslint adoption"