am 4790259c: am 8de2cf4c: merge from open-source master