Test: build Bug: 79270169 Change-Id: Iea5598f26649854521202363cad6ee297cef3057 (cherry picked from commit 486d1facfa)
486d1facfa