This reverts commit 959ba11426888cc5dfd054c04151fa69573c9eb5. Reason for revert: aosp/3050544 breaks this CL Change-Id: I9dcbcd3b8d6fb8f1e9c468cbca3ea7264bda264d
This reverts commit 959ba11426888cc5dfd054c04151fa69573c9eb5. Reason for revert: aosp/3050544 breaks this CL Change-Id: I9dcbcd3b8d6fb8f1e9c468cbca3ea7264bda264d