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