am 34bff9ae: am 8ac50107: merge from open-source master