Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev
am: fbd2c21f18

Change-Id: I228f8389c0459c6b1a3e7a211aae2ce4cbd9014a