Bug 936522 - Follow-up: Land change in android-sync. r=me
Bug 933300 - Follow-up: update copy code script. r=me
Merge branch 'develop' into elm