am ceb9b437: Merge "Adding system service proxy to help test UI/performance."

* commit 'ceb9b437f701f68411fcbef7e83b5df45834f9d9':
  Adding system service proxy to help test UI/performance.