am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb

* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
  Bugfixes in StaticLayout. DO NOT MERGE.