Revert to r305632

Change-Id: Ide53cfae09b01ee3c87405a1ecbb7dd065cf885d
65 files changed