am e9c2f18c: Merge "Add more debug info when a container view ID can\'t be found." into jb-mr1-dev

* commit 'e9c2f18c8ec9c5a09fce0d48a71bb2ce93ca75c4':
  Add more debug info when a container view ID can't be found.