Internal review fixes.

Change-Id: I695acdfbfac9c43b5ab9e9f74656202273808164