am 12b6f6ea: am 55b7d124: merge from open-source master