am 627356ce: am d6c0bb0f: merge from open-source master