Merge "Resolver - Fix NGA (voice interaction) crash in resolver" into qt-qpr1-dev
am: 636ae6a386

Change-Id: Id349a7a0f82f5ed252a04e2e89d6e422f4e04de1