Respect security for generic controllers.

Fixes-bug: 1240488
Change-Id: I80cdc4609cb1e977018721db3e37d1d0e217bde2
Merge "Respect security for generic controllers."