(Merged from go/wvgerrit/193672) Bug: 320785945 Test: GTS + unit tests Change-Id: I4a0c7568bf8323187f1156874ea98718511120f4