am b0492d69: am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size"

* commit 'b0492d6943fc590c2569dd2fc393db54a73986d3':
  Shrink profiler.start-immediately to fit in the maximum property size