move synchronization fix over from master

Bugfix 2622197.  Move this change over from master.

Change-Id: Ia965a457db575cbb990e8c6edd9b771b45b75cfd
1 file changed