Move couple things around.

Change-Id: If2b018d19f596946bbd6604badbcd1d799c7f131