Revert to previous base e53507209.

Test: git diff e53507209
Change-Id: Ib9a2e7081ab6e42cba0f3def781c575194ca1279
28 files changed