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

* commit '2a17399b0e74effcb712167430876281dad57828':
  Added and updated test cases in CTS.