Merge "SecurityManager: Don't use iterator after erase()" am: 1fa8f658ed
am: 51f5482c98

Change-Id: I262da17071a1d9f3d7715af4997d3e3d22570ad7