Cleaning up to ensure consistency with upstream.

Change-Id: Ic7bfacda7382967f0bf281478f205aa522a0c1e1