Have the fix things for some other branches.

This reverts commit c3bbea3c.

Change-Id: I57e6ff5cecb0b0a73673b52d00b2549c3cd3615e