am ccb0c7cd: am 7c1a018f: am f9e275b0: merge from open-source master