Test: Builds Bug: 129975435 Change-Id: I26ef76266b2f52746ca08a45f5013c580cecd4fb Merged-In: I26ef76266b2f52746ca08a45f5013c580cecd4fb (cherry picked from commit 1d081c50)