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

Change-Id: If6d095d10356d5a81a6b85ac2b5ebce5b3031736