Use separate switch ops for runtime permissions
am: e710a6fc66

Change-Id: Iac7d5e7f80ddbcafea3b1d26860e3cb0b46b6bd5