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

Change-Id: I45c388d4386b443a48b6c94632c373dfe1aa8af3