[ Merge from http://go/wvgerrit/74924 ] These were not previously being collected or were collected insufficiently. BUG: http://b/121090396 http://b/112919252 Test: Unit tests, Gplay, Nflix, GTS Change-Id: I32b7206cbe6071519b4a483fbcd0920dc1a26961
[ Merge from http://go/wvgerrit/74924 ] These were not previously being collected or were collected insufficiently. BUG: http://b/121090396 http://b/112919252 Test: Unit tests, Gplay, Nflix, GTS Change-Id: I32b7206cbe6071519b4a483fbcd0920dc1a26961