This reverts commit 640a3909a33c5688f7752e5db6f7c6b23801300c. Bug: 24293179 Change-Id: I9819f85d96bee240544beee9583b070c751cb9fc