Merge "Use sizeof(variable) instead of sizeof(type)"