am e465b117: Merge "Better debug info for layers." into honeycomb

* commit 'e465b11745cdc49283c360fb2acf01649f4f4fb0':
  Better debug info for layers.