am 1ae9ab3a: am 74df3dc9: merge from open-source master