am 9cf59510: Merge "CTS Version 2.3 R6" into gingerbread

* commit '9cf59510e8219d320cfbc9ffea2fdf50a9c00e9a':
  CTS Version 2.3 R6