Fixing previous broken commit.

Change-Id: Ie2bf876b493052cb12287ad0665a33b1785c09ea