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

Change-Id: I490613902b0c068fd95d3d9d8a4695769ca1e582