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

Change-Id: I08cd52a3c7e8ba00916e7da00f51551e7ca0985f