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

Change-Id: I8114e304fb5a320844522f0b986c05d11a64d79c