am cc42a2d6: am 44bce0fb: merge from open-source master