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

Change-Id: I558b3214ba13178ab5c411587f5170d1f5999c65