This reverts commit 358d0d3297.
This CL resulted in b/37933333 regression, so it'll have to re-land with a target API check.
Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b
This reverts commit 358d0d3297.
This CL resulted in b/37933333 regression, so it'll have to re-land with a target API check.
Change-Id: I1c2e4de43a15c1851d98f6aff432585ada80fb5b