am 9259663c: am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."

* commit '9259663cdb8f15226844e3ecfc6e3aa53614ad03':
  Fix a bunch of small system/core bugs.