am bc2f9318: am 57b44e52: am bc12cd04: merge from open-source master