Revert "Update to version 2.6.2."

Have the fix things for some other branches.

This reverts commit c3bbea3c3cfee4908189a57b3fc54f105b78c59b.

Change-Id: I57e6ff5cecb0b0a73673b52d00b2549c3cd3615e
111 files changed