Test: Builds Bug: 74827900 Change-Id: I8526e671a22a53b62dc629b1978bfaaf9103e5ad (cherry picked from commit 3190e2dc)