[automerger skipped] Merge changes I99720a37,I99a8f255 into qt-qpr1-dev am: 4bfd23eb78 am: d114664cde -s ours
am skip reason: Change-Id Id974769a4e9d89c01890b7557dd93f8444a3908f with SHA-1 463979efc3 is in history

Change-Id: Ifecd7fb6435ef9bc0aeb63f2c8ba91b9e92f0421