Merge "Avoid constructor with non-API class"