am 4929e5a5: am e4b9834f: am 6de3a6fd: merge from open-source master