Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979
am: 49dc9048fd

Change-Id: I37a87f67e0ca1cf2d4bb0ebe5bfe5ac68a2a13b6