Merge change I94ee30d0 into eclair-mr2

* changes:
  Fix the layout issue reported in b/2167690