Updated Android Roadmap
Uppercase in OTP name
Merge branch 'android_roadmap'