am 54709cb2: am bf11852a: merge from open-source master