merge from open-source master

Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101