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

Change-Id: I0522c8421786eec224ac415867eec5c3ba402fa7