am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE

* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.