am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev

* commit 'c168393b3ba99721be2c2d9629d687431aa6b9e0':
  Disable layer leak tracking