[automerger skipped] Merge "Do not crash if secontext is nullptr" am: 6418bb7d34 am: 95d26139a4
am: 598cc7a7af  -s ours

Change-Id: I4536831abc130299e7d1e61dccf42c06c42a5746