Merge "Fix SecurityControllerTest" into rvc-dev am: 6d03d973 am: 5874a74c am: e0667190 am: 6a900153 Change-Id: I761c1ca225095ea7700332b08894049dbce86869