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

* commit 'ee468ea8812e29420e25e3d2f510fbee6086a8f8':
  Make application/client id an object