Merge "New behavior of setSynchronousMode" into pi-dev am: 492457e94e
am: e953a1c5ab

Change-Id: I9bb84e2bafb1161fe85c7af05cf9fb4ae865e212