Merge "Private API to support MFF transition." into graphics-dev