am 9110b6c8: am 3523412f: merge from open-source master