am 12aea9d7: am 97bc628f: am 0a660528: Merge "Goo goo ga joob." into klp-dev

* commit '12aea9d7972abad702f9ded550179af722acdf47':
  Goo goo ga joob.