Merge "Remove silly 'm' prefix from StubObject/DeprecatedGlobal members"