am 72a6af1a: am 7d952644: merge from open-source master