am b4cc5e72: (-s ours) am 8a8ed3c0: Merge "DO NOT MERGE remove pts" into jb-mr2-dev

* commit 'b4cc5e720dbb613830d86dbc5ccca36d397a75b2':
  DO NOT MERGE remove pts