Follow-up to commit 98be1a9d. Hopefully fixes the Mac build. Test: m Change-Id: Id92ce77fa452bb7da1e84f9d7ef151702da86a23