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

Change-Id: Ib169be64e25377e88ae32cedc1b0dad7403a5876