[automerger skipped] Merge changes from topic "tdscdma-rscp" into qt-dev am: 67bce075 -s ours
am: 2b7732a9 -s ours
am skip reason: change_id Ia388a872ee6a0c02b74046aef1f04b0b4cf59130 with SHA1 c2b359a1 is in history
Change-Id: Ie0f4ceb92861fa426f50874b71f50fb305cde777