merge from open-source master

Change-Id: Id84ff747889d6f2c15c0510263e32fdfdd18dbed