Bug: 35425060 This reverts commit c29de85780. Change-Id: I4320be3473f914289f88c8cbb376a68af006d7de
c29de85780