[automerger skipped] Merge changes from topic "gps no sound" into qt-qpr1-dev...
[automerger skipped] Merge changes from topic "gps no sound" into qt-qpr1-dev am: c9713d61 -s ours
am skip reason: Change-Id I1c3882879d6576b7c1d9277acdd18d720529d3d6 with SHA-1 dcffd5f4 is in history
Change-Id: I8e5fad6808efe7a2d08c0430d4529035bdea1758