This reverts commit e4d0e949. Reason for revert: test monitor b/314212435 Change-Id: I53cd60d82f432d4eff132b5ee28227ece1ded7af