This reverts commit dec5b198. Reason for revert: a culprit of b/210553425 Change-Id: I3c2a7a80c497698c2fbc3e663a0a48004bec7ea8