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

* commit 'de7cc12900c7015849f818809368716174920337':
  Fix layout with no access points