Merge "Make framework classes non final"