[automerger skipped] SF: Enforce a size limitation on SurfaceTracing am: 738966bf16
am: e6a32a867c  -s ours

Change-Id: I2a67dc6ee4580dbd5e41c301557979055565d921