am da9a8535: am 216d8448: am 95f862bc: merge from open-source master