Dummy sources for Intellij IDEA / Play services
Allow erasing of personal note on server

This is the "release" part of fix for #4163.
Merge branch 'release' into upstream