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