Revert to r305632

Change-Id: If2436785be42467a8516109e154eec60077e8676
53 files changed