Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973c0 am: e4dd53af2b

Change-Id: Ib67e191ec962a9261227ff45b60fdf1173291260