Merge "Do not crash if secontext is nullptr"
am: 6418bb7d34

Change-Id: Iad725cb3c6a40a0917106dee3b2b604b1cb921a5