merge from open-source master

Change-Id: I8b1e7e238d9d0e828bea72530b5356b8386e48bc