Bug: 279809333 Test: build Change-Id: If6ef4c3b02d06212923e757fb68aa74e38c68db3 (cherry picked from commit 39dd515546)
39dd515546