am 4a94107f: am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev

* commit '4a94107f50d77cc634bb7e931a25ce9ab6b263df':
  Fix crash if package setting is not populated yet