Merge "If device config has a NAS related message, also enable importance adjustments" into qt-qpr1-dev am: 86bd6631ce
am: 559d21e727

Change-Id: I652f3fa989769e510088c9ccb56a0b70978532ce