This reverts commit e2adb2cf0f. Bug: 25004154 Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
e2adb2cf0f