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

Change-Id: I9f1b55ef59ff1479a77f53450bafb835ee6a2f72