Synchronised with kayobe at fe4dea965dd72ec85a70a09c708160457dcd92e3,
prior to cutting stable/ussuri branch.
Change-Id: I85ce7cc3cd4d9bc7c8e483d20f54ab380a11869f
Synchronised with kayobe at 93170249303bcfe0ee78350c4dbed02bf5895bee,
prior to cutting stable/stein branch.
Change-Id: I3d79a35a1c75aa9357fc5f77f6b82f9bff843b5e