Use separate switch ops for runtime permissions
am: e710a6fc66

Change-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8