Merge "Remove separate OpIds for logging and enforce op ids instead." into...
Merge "Remove separate OpIds for logging and enforce op ids instead." into rvc-dev am: 58e8d270 am: 54012151 am: b960f0f2
Change-Id: I7e27f3766863fa342248365f8378f1267ca96488