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

* commit '1bf3337289e640f93bf16ae4436d96b7847ff91f':
  Fix layout with no access points