[automerger skipped] Merge changes from topic "niap-vpn" into qt-dev am: 067b9dc4 -s ours
am: af3e5679 -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 4469b1d8 is in history
Change-Id: I5ff169bc9e974665a034a0a46c853ee10cfb9d1b