am 54525412: am 3aecdb9d: merge from open-source master