Merge "Add remaining whitelisted controllers" into pi-dev
am: da07a66365

Change-Id: I1b4a9e25da8138409d20e960dc68a4e8b5b2e459