merge from open-source master

Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75