Merge "BugFix: add synchronized protection" am: 0bc7ae7069
am: caa1953235

Change-Id: I74322787b089f51361c539b91a366c3dcfd4d871