BUG: 69983776 Test: Linux build still works Change-Id: Ia9b4f60191319b7595568b8433b90a9780d42a95 Merged-In: Ia9b4f60191319b7595568b8433b90a9780d42a95 (cherry picked from commit c0d2fea1)