Merge "Change mapping of QMI error" am: 5e3275d44e am: 48004a7491 am: 382c3333a2  -s ours am: c2bddd8443  -s ours
am: 45be5716ec  -s ours

Change-Id: Idfaed931d881e061da6fe05f0907ddfb1799c12f