This reverts commit e4a9911b68. Change-Id: Id260024dbf926a1defc1c5302a86b694e3c7f8c9 Bug: 36724262
e4a9911b68