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

Change-Id: Icc497964c5ac82e7f47c75b64a62bbdcf08a37b7