am 22bdacf2: Merge "Added and updated test cases in CTS." into gingerbread

* commit '22bdacf2f4c47f0e4d731a286f62ab1f9f8d08cd':
  Added and updated test cases in CTS.