am fa078d35: am 4c3a0457: Support new query parameters introduced in Iaab5c38a

* commit 'fa078d353c83d7739d7e175af418a255e837fe92':
  Support new query parameters introduced in Iaab5c38a