am 68e1d359: am 3bbdccc7: am c06d3091: am b640b49e: am 9feaaaf4: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75

* commit '68e1d359bd55785354656339db30dfd2d75ab7ce':
tree: 3024caa88cedc9f9eff427cd57ae2fe747721a0d
  1. tests/