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

Change-Id: I5c2d0cd57ce47b6af23b1d82d93e6f495060f950