All GridRow tests green

Change-Id: I91a2e32d7542767e60ad781b43e173224f0bfc28