Merge change 24903 into eclair

* changes:
  Fix some LayoutBridge javadoc.