Update versions#1712

dturner wants to merge 2 commits intomainandroid/nowinandroid:mainfrom

dt/update-versionsandroid/nowinandroid:dt/update-versionsCopy head branch name to clipboard