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

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