Merge "use new cmd command" am: ae2a64e2ba am: 143914ec2f
am: 39696f4ce8

* commit '39696f4ce8aa94f42d80c847ed5802a7df0b39c2':
  use new cmd command