Merge pull request #641 from bhariharan/unstable

Merge branch 'master' into unstable
Adding hybrid upgrade steps for Android
Edits
Formatting
Merge pull request #642 from bhariharan/master

Adding hybrid upgrade steps for Android
Merge branch 'master' into unstable