merge from open-source master

Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19