am 416af5f3: Merge "Increment CTS Version to 2.3 R5" into gingerbread

* commit '416af5f3cf91e6a0c848821b7cf62b96e84892b5':
  Increment CTS Version to 2.3 R5