Merge change 8177

* changes:
  Added patch support based on serializer state in the android client