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

Change-Id: Ib85eea6690b89cd4e5d8817fbea0845d9cdd0f45