am 166055b5: (-s ours) am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb

* commit '166055b529987554644dc47cb5b29ce33a1ab5d1':
  Bugfixes in StaticLayout. DO NOT MERGE.