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

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