am c6fed35c: am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev

* commit 'c6fed35cf4c2f260025c03b26f8be785afad42ee':
  Remove a few unnecessary withLayer() calls