Merge pull request #639 from bhariharan/unstable

Merge 'master' into unstable
Adding upgrade steps for Android native
Minor edits
Removing older version upgrade steps
Merge pull request #640 from bhariharan/master

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