am 9819bdb3: am 775a8df6: merge from open-source master