[ Merge of http://go/wvgerrit/24600 ] Test: Unit test only change. Verified by rerunning unittests. b/36221430 Change-Id: I36a8a0a5df400673689280cbf53ba9394f827c90