This reverts commit efec091bcb.
Reason for revert: aosp/1513473 fixed the underlying issue That make this revert necessary.
Change-Id: Ic99a6d080b4b1140924cb89d44b1f650f283a28d
This reverts commit efec091bcb.
Reason for revert: aosp/1513473 fixed the underlying issue That make this revert necessary.
Change-Id: Ic99a6d080b4b1140924cb89d44b1f650f283a28d