[ Merge of http://go/wvgerrit/24022 ] b/34327459 Test: Verified by unit, integration tests on angler Change-Id: Idb17dc472dddbdad217c35bdaa3fb20ae8152371