am ca846bfe: am 1faeaa6c: Merge "Check in System API file level 22." into lmp-mr1-dev

* commit 'ca846bfed49133b3bb474f63779635f4a424a5b3':
  Check in System API file level 22.