Test: builds BUG: 150476291 Change-Id: I6ffad927ecf48c697458bb6eb8f6f01847fe0954 (cherry picked from commit d97d9535)