Merge "Populate 'hasKnownUserIntentEmergency'" am: 59d8275546
am: b75330904e

Change-Id: I657738047be85983dd633322ac5abe8d48b32f44