[automerger skipped] Merge changes I305b3231,I2fcd959a,I31dec95f into qt-qpr1-dev am: fdb60fa1 -s ours
am skip reason: Change-Id I305b323194f7732967db9a086d2c8a689798e64d with SHA-1 f74a94df is in history
Change-Id: I6f5ee402e999773b6b9f834ef9bd87ec9049e805