Minor cleanup after Jumbo CL am: e79ac55dc0 am: 42210fb66f am: 106bee99d5
Minor cleanup after Jumbo CL am: e79ac55dc0 am: 42210fb66f
am: 106bee99d5

Change-Id: I36e0696927307256b649511e19cc85bb88b0737c

google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto,google/perfetto