Merge "Populate 'hasKnownUserIntentEmergency' flag" am: 168fe2f078
am: d653fb043e

Change-Id: Ia3ef461886d90f1fb52b747bc05b24471d179d85