Bug: 69478930 Test: make, no user visible change Change-Id: I999d0c445fe3b24aca72961c40c3428901542bc1 (cherry picked from commit ee81f991)