am 6558d4e7: am ee468ea8: am 6326f964: Merge "Make application/client id an object"

* commit '6558d4e75e8a129b1b1a78824ed091962a2574ef':
  Make application/client id an object