This reverts commit ea440a76, reversing changes made to 0b90c524. Test: Build Bug: 73659459 Change-Id: Id5a5147c6478cf10661aebe52b445bd16195885e