am 378e5722: set default client id

Merge commit '378e5722d0cad2b082afb42ea64405286de332a5'

* commit '378e5722d0cad2b082afb42ea64405286de332a5':
  set default client id