Merge "Reset lockout for correct profile/user" into qt-r1-dev
am: 8618ea96fd

Change-Id: I8f00661426682a3a7150a3074b81fa8ad02807a2