Merge "Update system API to match current code." into nyc-dev
am: 76e287b

* commit '76e287b42359985af57b8ae874a24afccdc2f251':
  Update system API to match current code.

Change-Id: Ia18d5dcddb6cbd5e8197f13cc1fa0d2ebd68889d