merge from open-source master

Change-Id: I50b7bc6faa6d0abd4998cae8fc7dda1e8fa49407