[Merged from http://go/wvgerrit/152150 ] Test: build and run test Bug: 226948319 Change-Id: I717d119cbf455fe76e4bb1f818d00141f4e7fa7c
[Merged from http://go/wvgerrit/152150 ] Test: build and run test Bug: 226948319 Change-Id: I717d119cbf455fe76e4bb1f818d00141f4e7fa7c