am 08a42a05: am 9867f949: merge from open-source master