This reverts commit dc1d29f0. Reason for revert: b/156037652 Change-Id: I775a7cc92a4e891a1ffb42e8f4e20b336c47e858