[automerger skipped] Merge changes I305b3231,I2fcd959a,I31dec95f into qt-qpr1-dev am: 191f5244 -s ours am: 5c216167 -s ours
am skip reason: Change-Id I305b323194f7732967db9a086d2c8a689798e64d with SHA-1 e3c349a1 is in history
Change-Id: I037fd333c0ec1cf1d80dc7c6767a7ecf65016124