This reverts commit 56bda7e82a. Bug: 30815709 Change-Id: I057d9bcd05246e58894abb4e9633bd10f6fab211
56bda7e82a