This reverts commit fde94783. Reason for revert: triggers other issue. Bug: 114365189 Change-Id: I37523a1778d55153253cf10df1ede68c5acb8178