am 4d6a097b: Merge "Overlay swap capability after merge" into lmp-mr1-dev

* commit '4d6a097bdd42e9a0dea62d8ca6c909a927c117f6':
  Overlay swap capability after merge