Use separate switch ops for runtime permissions am: e710a6fc66 am: 7751660b2a
am: c6107e1834

Change-Id: I7ddec832ff602026d28ea6f7ab649e72bde48d24