Merge "resolve merge conflicts of c19c1c2 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: bce19ce

* commit 'bce19ce7dff918c12604614a5e27d02b78e877a4':
  Add ProfileSaver stats and dump them during SigQuit