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

Change-Id: I6aefe7afa93353652b1a993611c2b72ea72e04c6