am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75

* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
tree: b0d6ca40bde4f2dbf8a69bd982bf053825434ab4
  1. tests/