merge from open-source master

Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7