This reverts commit e5c34615. Reason for revert: Try to submit the change separately Change-Id: I3bf6e641983866effb8d54044dea4a94b10ba93c