This reverts commit 5a305645c1. Reason for revert: b/325861149 Change-Id: I4441f939a46bf65514756a015355ea5089147c1d
5a305645c1