Test: Builds Bug: 74827900 Change-Id: I73599f6271274bf1044ae6e2c800e3290111407a (cherry picked from commit d16bad95)