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

Change-Id: I38f26eb0bcb75202a12e15fba7da3fa3fcba392f