(This is a merge of http://go/wvgerrit/70304) Test: build_and_run_all_unit_tests Bug: 122953649 Change-Id: I6f201f460a0779a23e72db2bbc5d22e3f47cdd42