""" Fix bug where sync could fail in Android 7 devices
Also, for a few users we rolled the following experimental changes:
* X, Y and Z