Merge "Bug 2021 - NORMAL and CONTROLLER flows should not use hard coded strings"