[automerger skipped] Merge "Add remaining whitelisted controllers" into pi-dev am: da07a66365
am: b9d07718d5  -s ours

Change-Id: Ia5716209c19f1868b6364c8f585c28942d3b3072