This reverts commit 4ff668d47a. Bug: 19894176 Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd
4ff668d47a