Merge "Fixed race condition with different profiles" into qt-r1-dev am: 5faf43ad73
am: 59e20c2e89

Change-Id: Ib31d00e9543403ce3e0ea702cc595a926d0db8c7