am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1 am: dbb59f22db

Original change: undetermined

Change-Id: Ibe67ef9db5e3960da17e1bcf7a45783e2309c510