merge from open-source master

Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c