[automerger skipped] Merge "Add active admin app to power white list." into pi-dev am: a14e1b3950
am: 1e6fc486e3  -s ours

Change-Id: Ic3a6fb846ae7fb496a6dc246d72749f29d6cf5de