am db20eeb2: am 9167ba50: merge from open-source master