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

* commit '671d5965f7b15ecba10453e8f445418dc0e730e6':
  Fixes for sm and pm usage