merge from open-source master

Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c