[ Merge from http://go/wvgerrit/78383 ] Bug: http://b/121049662 Test: Re-ran the unit test. Change-Id: I62c00f425c93b588e123ddd8b1093177f2e9b241