am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb

* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
  Removed warnings in DynamicLayout