am f450fa5f: merge from open-source master