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

Change-Id: Id7a6a31398cf703e1ca3fe730d79457d5829b66d