This reverts commit 6b172567. Reason for revert: Unexpected Crash Bug: 149282975 Change-Id: I674397398ae40d106f84e6a650f75e77769e9de1