This reverts commit 34b91122. r335145 Bug: 113573336 Change-Id: Id27591d390f97b69d048714612543291f4c5af05