Test: Builds Bug: 74827900 Change-Id: I325521b736b14077d44b24c458ee1ad995273569 (cherry picked from commit b0325674)