Revert to r305632

Change-Id: Idce05a34e8e464aec4449d5adf5c2269d1c42ed6
29 files changed