merge from open-source master

Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d