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