merge from open-source master

Change-Id: I99a88f61bc0f3ddcc233b6784e24427a7f8978be