[automerger skipped] Merge changes from topic "permissions" into qt-dev am: 5df2e3e7 -s ours
am: 7341a3ae -s ours
am skip reason: change_id I7f2183cd2f764b8293d29dc2c278479e06d9d8a2 with SHA1 995c9ad4 is in history
Change-Id: I7f288701179277f0fea9790784b258c37e886936