This reverts commit d8cae216. Reason for revert: Dependent patch has been reapplied (ag/1683577) Change-Id: I084744bcaf73c27b670276dcc7b66495de4f9c68