am 298c170a: am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev automerge: 9917ebe

* commit '298c170ae78d2c80f141e7cef15e42be3481549f':
  Fix the length of a profiler system property