Merge "Fixes for sm and pm usage"
am: ffb15da518

* commit 'ffb15da518e35727e218bfba48927902d4368e2f':
  Fixes for sm and pm usage