TrivialRebase: Replace category_id with label terms have changed in 2.6. schema still hasn't. Change-Id: I1003d420fcd5b2f56b9c1dc7955f761c37253dc5