am 5f96962c: am 1e158e9c: Merge "Propagating core settings to the system process." into honeycomb-mr1

* commit '5f96962caa23eec25d449e47a2f677d1ff8e53c9':
  Propagating core settings to the system process.