bug:22820834 This reverts commit 876d56612a. Change-Id: I4e07a0894095caaaf2fd36bfa6073d033542bfc4
876d56612a