am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev

* commit '26bb2398cf8ebe1879adfb3043709467474858ec':
  Fix layout with no access points