am 53a79a84: am 49337b27: merge from open-source master