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

* commit '97bc628fa737a87b0b855b76404fd1527eca67f8':
  Goo goo ga joob.