merge from open-source master

Change-Id: Idcbf7a3a8e9c171b62c210ad174b63dfed3ed42c