This reverts commit aa96e8898c. Reason for revert: It caused BB, and b/139257138 is for your reference Change-Id: I93f1d0ba0fa43325e2815e9b2de84bb7cb41c457
aa96e8898c