merge from open-source master

Change-Id: I96d2cd063f084fd17116bf7ee08fa7109a3c1ceb