This reverts commit 6f6a126b. Reason for revert: Bad merge into internal Change-Id: Iffe5be7c10e8438bd46f71dc22e0867c0d316d40