Revert to previous base 04d162f71f6.

Test: git diff 04d162f71f6
Change-Id: I5a7cc347a595f82febf4ce2eaf55b720c8a1c971
42 files changed