This reverts commit 5e8ab96efb. Bug: 198239103 Test: build pass on git_tm-qpr-dev-plus-aosp Test: build pass on git_stage-aosp-master Change-Id: I64fa53bef8a88b219ddb154dc919a1313f4e9db7
5e8ab96efb